sizegroup: Remove special case before loop
authorBenjamin Otte <otte@redhat.com>
Tue, 15 Sep 2015 20:11:35 +0000 (22:11 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 28 Oct 2015 18:44:27 +0000 (19:44 +0100)
The loop actually does the right thing already. There's no need to
complicate things.

gtk/gtksizegroup.c

index 798b57133ee0c5d0d6b47d1653e726f3df78b50a..a0167ec06483169edee4987e4d6ac8e6dc1714ed 100644 (file)
@@ -206,37 +206,22 @@ _gtk_size_group_get_widget_peers (GtkWidget      *for_widget,
 static void
 real_queue_resize (GtkWidget *widget)
 {
-  GtkWidget *container;
-
-  _gtk_widget_set_alloc_needed (widget, TRUE);
-  _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
-
-  container = _gtk_widget_get_parent (widget);
-  if (!container &&
-      _gtk_widget_is_toplevel (widget) && GTK_IS_CONTAINER (widget))
-    container = widget;
-
-  if (container)
+  do
     {
-      widget = container;
+      _gtk_widget_set_alloc_needed (widget, TRUE);
+      _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
 
-      do
+      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+      if (GTK_IS_RESIZE_CONTAINER (widget))
         {
-          _gtk_widget_set_alloc_needed (widget, TRUE);
-          _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
-
-          G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-          if (GTK_IS_RESIZE_CONTAINER (widget))
-            {
-              gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
-              break;
-            }
-          G_GNUC_END_IGNORE_DEPRECATIONS;
-
-          widget = gtk_widget_get_parent (widget);
+          gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
+          break;
         }
-      while (widget);
+      G_GNUC_END_IGNORE_DEPRECATIONS;
+
+      widget = gtk_widget_get_parent (widget);
     }
+  while (widget);
 }
 
 static void